feat(MK8S-196): expose shared QueryClient to MCP tools via ToolContext by JBWatenbergScality · Pull Request #4925 · scality/metalk8s

JBWatenbergScality · 2026-05-11T12:25:15Z

Summary

Add queryClient: QueryClient to ToolContext so federated apps' MCP tools can keep chat-side panels in sync after mutations.
Populate it in MCPRegistrar from the shell-ui-owned queryClient exported by FederatedApp.tsx.

Follow-up to merged PR #4820 (branch was kept alive). Pairs with:

scality/data-browser#367 — per-tool cache-sync via injected QueryClient
feat(ZKUI-472): WebMCP tools for AI agent automation zenko-ui#1185 — targeted invalidation in zenko's MCP tools

Why

The previous wrapper-side approach (zenko-ui's withQueryCacheInvalidation) called invalidateQueries() with no arguments after every non-readonly tool, blowing the entire cache — including auth queries — and leaving the UI empty. Injecting the QueryClient lets each tool target only the keys it actually affects.

Test plan

Type-check passes (`npm run check-types`).
Manual E2E on the ARTESCA test cluster: agent-driven `createBucket` refreshes the bucket panel without empty-UI regression.

🤖 Generated with Claude Code

bert-e · 2026-05-11T12:25:20Z

Hello jbwatenbergscality,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options

name	description	privileged	authored
`/after_pull_request`	Wait for the given pull request id to be merged before continuing with the current one.
`/bypass_author_approval`	Bypass the pull request author's approval	⭐
`/bypass_build_status`	Bypass the build and test status	⭐
`/bypass_commit_size`	Bypass the check on the size of the changeset `TBA`	⭐
`/bypass_incompatible_branch`	Bypass the check on the source branch prefix	⭐
`/bypass_jira_check`	Bypass the Jira issue check	⭐
`/bypass_peer_approval`	Bypass the pull request peers' approval	⭐
`/bypass_leader_approval`	Bypass the pull request leaders' approval	⭐
`/approve`	Instruct Bert-E that the author has approved the pull request.		✍️
`/create_pull_requests`	Allow the creation of integration pull requests.
`/create_integration_branches`	Allow the creation of integration branches.
`/no_octopus`	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
`/unanimity`	Change review acceptance criteria from `one reviewer at least` to `all reviewers`
`/wait`	Instruct Bert-E not to run until further notice.

Available commands

name	description	privileged
`/help`	Print Bert-E's manual in the pull request.
`/status`	Print Bert-E's current status in the pull request `TBA`
`/clear`	Remove all comments from Bert-E from the history `TBA`
`/retry`	Re-start a fresh build `TBA`
`/build`	Re-start a fresh build `TBA`
`/force_reset`	Delete integration branches & pull requests, and restart merge process from the beginning.
`/reset`	Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

bert-e · 2026-05-11T12:25:25Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

JBWatenbergScality · 2026-05-21T06:37:10Z

/approve

JBWatenbergScality · 2026-05-21T06:39:14Z

      get getToken() { return getTokenRef.current; },
      get userData() { return userDataRef.current; },
      selfConfiguration,
+      queryClient: shellQueryClient,


nit: instead of importing shellQueryClient from ../FederatedApp, _InternalMCPRegistrar can likely useQueryClient to retireve it.

Add `queryClient: QueryClient` to `ToolContext` so federated apps' MCP tools can keep chat-side panels in sync after mutations. The QueryClient is retrieved via react-query's `useQueryClient` hook, which works because `MCPRegistrar` is rendered inside the shell-ui `QueryClientProvider`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

bert-e · 2026-05-21T06:46:58Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge feature/MK8S-196-add-webmcp-protocol-support into
development/133.0
w/134.0/feature/MK8S-196-add-webmcp-protocol-support will be merged into development/134.0

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.0
development/127.0
development/128.0
development/129.0
development/130.0
development/131.0
development/132.0
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

bert-e · 2026-05-21T06:47:00Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
2 peers

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

claude · 2026-05-21T06:48:02Z

LGTM — clean, minimal change. The queryClient reference from useQueryClient() is stable (same object for the provider's lifetime), so adding it to the effect dependency array is correct and won't cause unnecessary re-registrations. Test coverage is updated appropriately, and the type extension is backward-compatible since ToolContext is produced by shell-ui, not consumed from external callers.

Review by Claude Code

JBWatenbergScality · 2026-05-21T07:08:23Z

/approve

bert-e · 2026-05-22T14:54:16Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/133.0
✔️ development/134.0

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.0
development/127.0
development/128.0
development/129.0
development/130.0
development/131.0
development/132.0
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2026-05-22T17:36:36Z

Queue build failed

The corresponding build for the queue failed:

Checkout the status page.
Identify the failing build and review the logs.
If no issue is found, re-run the build.
If an issue is identified, checkout the steps below to remove
the pull request from the queue for further analysis and maybe rebase/merge.

Remove the pull request from the queue

Add a /wait comment on this pull request.
Click on login on the status page.
Go into the manage page.
Find the option called Rebuild the queue and click on it.
Bert-E will loop again on all pull requests to put the valid ones
in the queue again, while skipping the one with the /wait comment.
Wait for the new queue to merge, then merge/rebase your pull request
with the latest changes to then work on a proper fix.
Once the issue is fixed, delete the /wait comment and
follow the usual process to merge the pull request.

JBWatenbergScality marked this pull request as ready for review May 21, 2026 06:37

JBWatenbergScality requested a review from a team as a code owner May 21, 2026 06:37

JBWatenbergScality commented May 21, 2026

View reviewed changes

JBWatenbergScality force-pushed the feature/MK8S-196-add-webmcp-protocol-support branch from c50a36f to e297d82 Compare May 21, 2026 06:46

JBWatenbergScality changed the base branch from development/132.0 to development/133.0 May 21, 2026 06:46

claude Bot reviewed May 21, 2026

View reviewed changes

Comment thread shell-ui/src/mcp/MCPRegistrar.tsx

damiengillesscality approved these changes May 21, 2026

View reviewed changes

ChengYanJin approved these changes May 22, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(MK8S-196): expose shared QueryClient to MCP tools via ToolContext#4925

feat(MK8S-196): expose shared QueryClient to MCP tools via ToolContext#4925
JBWatenbergScality wants to merge 1 commit into
development/133.0from
feature/MK8S-196-add-webmcp-protocol-support

JBWatenbergScality commented May 11, 2026

Uh oh!

bert-e commented May 11, 2026

Uh oh!

bert-e commented May 11, 2026

Uh oh!

JBWatenbergScality commented May 21, 2026

Uh oh!

JBWatenbergScality May 21, 2026

Uh oh!

bert-e commented May 21, 2026

Uh oh!

bert-e commented May 21, 2026

Uh oh!

Uh oh!

claude Bot commented May 21, 2026

Uh oh!

JBWatenbergScality commented May 21, 2026

Uh oh!

bert-e commented May 22, 2026

Uh oh!

bert-e commented May 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

JBWatenbergScality commented May 11, 2026

Summary

Why

Test plan

Uh oh!

bert-e commented May 11, 2026

Hello jbwatenbergscality,

Uh oh!

bert-e commented May 11, 2026

Request integration branches

Uh oh!

JBWatenbergScality commented May 21, 2026

Uh oh!

JBWatenbergScality May 21, 2026

Choose a reason for hiding this comment

Uh oh!

bert-e commented May 21, 2026

Integration data created

Uh oh!

bert-e commented May 21, 2026

Waiting for approval

Uh oh!

Uh oh!

claude Bot commented May 21, 2026

Uh oh!

JBWatenbergScality commented May 21, 2026

Uh oh!

bert-e commented May 22, 2026

In the queue

Uh oh!

bert-e commented May 22, 2026

Queue build failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants